Fixed builder bug