Fix for other impls (specifically CCL)