fix theme2 problem