[DF-4218] fix major bug