Update for hermes @ 97029a1