Change argument order for input handlers