custom context fix