Fix backwards compat