fixed github issue #26