Address the issue with  possibly containing dots.