Blind fix for Windows

Change-Id: I186024f8a95ada752115750419a54a6231967f57