merged the context error patches
0.6.1