bug fix

I HAVE MERGE CODE FROM ＬＵＺＴＡＫ
TAT