fixed issue #214