Fixed to work with latest rust version