Bugfix input handling