Try to fix Bug on switching theme