Fixed @ symbol escaping