Application context fix again.