Fix to get buildbot testing passed