Another compatability fix