Fix logic again

Change-Id: Ie791e587068e107a2467eab556bcf10b7159a5ce