fixing on load_site()