Fixing bug for non individual cases