#33 tweak to support field indices