Entity Builder bug fix.