map is working again and everything is OK
updated map with set fix