Suggestions fix