Temporary workaround for input handling problems