Attempt to fix mapmerge issue