fix state
fix state again