Re-fixed 1.6 compatability