DDBEXTRA-132: changed control flow