Update Builder.php

Solved grouping issues