[MAP] Fixing collision