compatibility with rust master