Typo and logical error in builder fixed.