fix statics, possibly relies on patch making it's way to 5.5 today