fixed theme issue