Make default also include leading space