#2 fix map issue