Repair BUG..