Fixing issue #6

Issue is fixed and tested.