Overdue fix

Comments