Proper context fix