Bit better compatibility

Should now work without unneecssary patching with 0.9.1 too.