make it work with latest rust