Last bug fix.