Compatability fix