fixed issue #5