fix for addresses containing groups