Fixing issue #5

Fixes #5