Fixed  Issue #84