Further fixing wrt. new hermes.