Incident #19550 - fixed some problems