Fixes #55 Problems with external contexts