- fix backwards compat