Repair some fix. Multiple instances solved