Fixed timeout handling