line 228 add condition