Fixing initial load