DB-4521 fixed