Fix issue #116 on github