Fixed GitHub issue #21