[#24] Escape properly expression in last commit