Added a check for "."