Issue #4 Fixed