Fix for latest rust-master

Should be correct this time ...