Correct deactivation bug