Did loads of stuff... and now it works with the MS impl.