Not sure that we want to fix that in 1.1 considering all the changes coming to the map, but it's probably a good idea to keep this issue in mind when updating for 8.0.