Fix the bug of extra space