Widget code fix 1
Widget code fix 2