Fixing variable quoting