Fixed bug in Update.php, still need to fix in Load.php