Fixed some empty space bug