fixed issue #17.