refix issue #7