fixed for latest rust