Backwards compat fix