Fixed for latest rust changes