Fix previous fix

Change-Id: I6a38e537279884079fbc10086d153113d38b8bfd