state issues fixed