Latest rust fix