Fix patch

Change-Id: I18608380bf89822ce402e79038f2016af17b2ead