[DF-4453] Fix major bug