Fix issue #7

fixes issue #7