Fixing spacing problems