fixed activation & deactivation problem