Widget fix

All tests pass.