Fix shell escape space issue -Pat