#237 fixup