Fix multiple definitions of spaces.