Fixes #1485
Merge pull request #1486 from vdwijngaert/patch-1

Fixes #1485, props @vdwijngaert