Another fix for GTM demographics issue