Fixes #78 but there is now an issue with jump that I'll have to track
down.