Made space replacement work.