made sf2.4 dev compatible