Issue #3 Fixed