fixed disaptcher