master fixup