Added missing subId check