Mapmerge fix (?)
- Hopefully fixes mapmerge-caused issue from previous commit.