#4218: fix rare roam crash