Fix space preservation