I fixed this in branch medranocalvo-correct-quoting [9485f6bb80].  Please test it.