fixup after merge