Add variable to fix "at sign" issues