Partially relax last commit for quoting issue