Fixing logic error with Context execution