Fixed dealing with other characters