Empty context fix