fixed issue #2