execution context fix and test