Repair BUG
merge By Repair BUG
Update Two Files