fix previous commit's problem of All will got error