Adding some backwards compatibility with 2.4.x