Input switching fix