Fix break due to update to 6.6.2