Fixed Issue #82