Fix for initial load crash