fix raise error sometime in lines 58