Restored to previous modifier logic