builder bugfix :.(