Pick up fix for unbinding widget events