[resolve the issue SAT-1379 22_nov]