Improving 2.3.5 compatability