Merge "Fixing a bug in the load function."