Fixing bug with fetch groups