Fixed for the latest Rust