Fixed initializing states from same to same state