Fix space highlight issue