Fix context sharing
Merge pull request #327 from tribal-tec/master

Fix context sharing