fixing messing '@' in templates