ticket:24 Fix for map at bb