Ensured backwards compatibility with 2.0.4