Fix issue with Gerrit 2.8