Bug fix: overzealous domain automation