Fixed disable button problems