Modified implementation of deactivate modify controls