hopefully make UW a bit more reliable

Change-Id: Ic48a80c239bef23ef237e7546700770bd62eae88