fix bugs after new styles