sf 2.6 compatibility