Duplicate variable suggestions fixed (belongs to #7)