Fix to support current rustc