Well, relying on the architecture is fragile. I'll update with the flag.