fixed issue #18