fixed issue #22