DDBNEXT-363 fixed