fixed issue #212