Fixed compatibility with latest sf 2.3.* version