update for compatibility with sf2.5