Further improved hadling of '-' and '.'