MapBuilder now handles edge cases better