Remove Sf2.4 limitation