better space handling