Fixed for new Rust version