try to make it works on sf2.2