fixed for latest Rust