fixed issue #16