Fixed Map Layers bug