Another silly bug fix..