Fix for latest rustc