White Space Issue from #1805