Issue #8 Fix