Task #100: Fixed b2-model-builder...