Fixed broken group lookup