imperfect, but a possible solution to the infinite loop of #6376