fixed button issue