Bug with Thread Remove fixed