Fixed Mapbug