Fix compatibility with clint HEAD version

Fix compatibility with clint HEAD version