Fix button mutating bug