Fixed issue #6

fixed issue #6