Fix issue triggered with 2.10