Backwards compatibility for 1.6.x