Fixed builder loop, previous refactor caused infinite loop.