Fix white space removal (again)