Fixed Issue #83