Actually take timeout into account