Work around until commit  #79 is merged upstread.