finally fixed issue #2