Fix github issue #37