Better no space handling