Overdue bug fix