Thought we fixed the base64 grouping, but here's the fix.