mount fixup part 1