LPS-43772 fix LPS-41388
LPS-43772 No need to loop tree times