Spring context fix