Fix space replacement by _