DDBNEXT-444 Solved hot fix