Resolved issue with EE <2.6 compatability