Fix handling of default context
Merge pull request #3107 from imurchie/isaac-contexts

Fix handling of default context