Minor merge fixup - sorry