fix themeId duplicated in some case