Fix logic again

Change-Id: Ic8489019c5ba3aa0292e7d854de095403ca42ae7