DDBNEXT-201: Fix for other locales