fixed issue #26