Issue #35 : keep the whitespaces in the preprocessing stage