Bugfix for Suggestions