Fix for 1.6 compatability