added fix for map