Backwards-compatibility with 1.9 and 2.0