Bugfix for Mode6