One bug fix