Fixed CanExecute Check