fixup following merge