Fix SF 2.2.* compatibility