Fixs some state cases