Fixed for latest Rust