Added space handling