#13793 join fix