DDBNEXT-424 hotfix