Fixed issue #83
Fixed issue #83
Fixed issue #83 (closes #83)