ugly hack for recent Rust changes