Fix incorrect (non wrap safe) timeout process

As title says.