Fix remaining char logic