WIP #7732 remove possibility for infinite loop