fixed issue with map