Fix button conversion