there is now a patch for this too, in my repo