Make AddSpace more robust