gh-798

Fixes #798
@Rich-Harris , any opinion before merging?