fixed issue #215