Fixed button issue