Future context restores state even when interrupted.
Merge pull request #895 from pp-mo/future_fix

Future context restores state even when interrupted.