fix state again