Fix space trimming issue btw. 1.8.7 and 1.9.3