BC-2481 #resolve. fixed missed condition