Fixes Github issue #21