fixed state issues