Fixed CharacterHandler