Fix for latest Rust