removed bug from empty context