More 1.9 compatability