fixed issue on deactivation process