On load issues additional fix