temp hacks to get it working on SII