Issue #82 Fix