fixed issues with map