TODO fix in Characters.cs