Fix for suggestions