Fix the re-run issue when UIFW suite is included.