di: Make the decision about DI in one if-else statement

di: Make the decision about DI in one if-else statement #626