fix the button issue