Fix for latest rust master