Fixed not working button issue