fixed issue #23