A more comprehensive fix for the spacing issue.