fixed where builder bug