Fix space numbering