Fixed state transitions so that resolves are reloaded.