MW-930 Correct build parsing