continue on 2.6 compatability