builder bug fixing