#546 repair state in overview