Issue #1 Fix