Blind Win fix attempt

Change-Id: I39df464321685ebef29f44221bab9005295d0c3f