Fixed some incident logic