Fixed backwards compatibility with v 1.6