added sf2.1 compatibility