Added check for the presence of "dot"