Support SF 2.6

This will support sf 2.6 I believe :)