More bug fix.