Fix button problem