fixed State issue