Dealing with special characters better