activation and deactivation problem fixed