ticket:72 Another fix for buildbot