fix state corruption