Issue #59 Fix