Bugfix for custom input handler