Experimental fix for initial load.