Bugfix, mode change