fixed disable button issue after refactoring some names