Disqualification under section 164(2).

If a company has committed any default under 164(2)(a) or 164(2)(b), than as per companies amendment act 2017, can a director continue the office in the defaulting company till the expiry of his tenure of appointment if:-
Case 1: He has been appointed for less than 6 months till date of default
Case 2: He has been appointed for more than 6 months till date of default.

Thanks!!