finally fix the changing turn bug