Get groupingHash liberation back to this fork