fixed state issue