Bugfix in manual mode