fixed issue #3: fixed issue#3