Fix for DB-4594