Fix to load issue