Fixed order timeout issue