Yet another bug fix. :P