close issue #26