Fixed MapBuilder