fixed button issue2