hopefully map fixed
map partially fixed