more bug fix.