Fix for suggestions 2