[solve the issue SAT-1355,SAT-1356,SAT-1357,SAT-1358,SAT-1359,SAT-1363,BEINGME-71,SAT-1364,SAT-1365,SAT-1369,SAT-1370,SAT-1371,SAT-1372,SAT-13]