Another mini-bug fix