Fixing issue #4

Issue #4