Fixed sf2.3 compatibility