Fixed to support no dots.