Fix timeouts not firing

Apparently some timeouts are still not firing, this pull request will try to deal with this issue

Not ready to be merged yet