fixed backwards compatibility