Fix utils

Change-Id: I3d90430c59f7f7ee98303b56bdd016c0edb55fa2