fixed bug with map