eb bug fix.