Try to fix the leading empty problem