Fixed issue where '.' etc. would be included.