IOW fix

Change-Id: If6e0f1ca6d208bfab568509d0ab83432259e7db4