Take care of spaces