change to 1.4 compatability