DDBNEXT-376 hot-fix