fixing missing '@' for vars in template