Fix for rust-master