Fix space & pipe
Merge commit