r801: Fix from "Jianliang Lu" <j.lu@tiesse.com> to return correct group