Back compatibility to 1.6.x