fixes for suggestion