Messy solution for the thread display issue