Fixed EOD problem with 1.9.3