Fix for DB-4979