Fixed  Issue #97