Bug fix for correct output type in builder