Fix the init and load method