better fix state