Hacks to use SS 3.1