More Debugging

Checking the active thread does not work as of the moment,