Fix for breaking change by Rust