On load issues fix