Fix for build break on buildbot