DDBNEXT-464 hotfix