Fix for DB-2659