Fix colliding mapping