Resolves mapmerge issue from previous commit (hopefully)