Added support for multiple dot detection