Adapt to change in rust