Fix Issue #7
Fixed issue #7