Fixes gh issue #22