Fixed issue #97