Long overdue fix