Fix:  Issue #19