Fixing for hg 2.9