fix/hermes-state-holders