Fixes #6599

And a spacing issue, too.
Does ```&apos;``` work here?