still on timeout bug