Ugly work-around to having huge numbers of fields