fix for DB-2920