fixed issue #21