fixed handler deactivation