Temp fix for sf 2.3.4+