fixed issue #221