Fixing deactivation not to commit on ever record