revised fix about initial load