Fix the button problem