Fix to avoid escaping the count