fixed issue #297