fix the fill account issue