Added conditional lint