Fix button press issue