DB-4832 fixed