upstream: fixed problems with RGB images in maps