Second attempt at correcting spacing