Patch for current versions of Moose