Work around until commit  #79 is merged upstream