Fixed Button activation/deactivation issue.