add back (totally confusing) accidentally-removed code due to use of "types"