Fixed potential unmappable character error