Fix deactivate