Fixes mapmerge issue