Updated to work with a more recent version of rust