close issue #7