Fixed Map editing