- Add suggestion from #76
