Map conflict fix

I hate those...