Weird thought I fixed it

Change-Id: Ief3cf6c0948ef62dd8a59e814c1c32092deb9497