Fixed few spaces