Fix:  Issue #21