fix states issues