Bugfix for Bugfix for Mode6