Fix an issue with the contexts

This is to fix issue #398