fixes #13 (for real this time)
- reverted the "fix" for the multiple contexts