[ddbnext-29] fix for [ddbnext-8]