[desc]Another bugs fixed
[desc]