schema fix #14,920