Fix space breaking