Attempt to fix eventual deadlock
Fix requeuing for when using namespace