Possible widget fix. No way to test though