Fix for Rust master

All tests pass for me now.