fixed backwards compat