Fixing AUTO_MARK_CLIENT_FIELDS