Temp compatability fix.