Part 1 of spacing issue fix.