builder bugfix