Fixes GH-66, probably.
Fixes GH-86, thanks Derangement.