Fix fires/button sync