fixed issue #17