Suggestion fix