Yet another bug fix