Changes for 7.8 fixes #5

Here's a wrapping.
I would think it would be a safe bet without that though.