Fix that sometimes % wasn't escaped properly, triggering an assert