OP-1201 fix else branch to leave the behaviour unchanged