Fix #97 issue

See #97 issue