Fix after commit ca575ea584427305d4783d73987158159ada94cf