fix bug around spaces