Fixed crash on load bug