Fix button active state