Fixed Issue #97