Issue #1 Fixed