Fixed memory context usage