activation and deactivation problem fixed
some fix