New version for map issue fix