fix: infin loop fixed