Quick-and-dirty bug fix to the last change.