Fixed switch triggering button press bug