Fix comparison between signed/unsigned

Change-Id: I0d969ebd523bd20fc36bd8ae63617f2d5a162fe3