modify and allow 'xxxx.' and '+.xxx'