Better space handling