Made work with latest rust