Compatible with latest rust update