Solve the pesky space/plus promblem.