Ensures compatibility with 1.6.4 and 1.7.x