Account for spaces