Fix EOD crash