Fix issue with first space.