Fix for DDBNEXT-1742