[DF-1593] Additional fix.