Fix Race Condition on Timeout