Yet another bug fix.