Fix button issue