Better white-space fix