fixing initial load