fix Widget class mixup