Finally some real backwards compatibility!