Make it work with Rust master