One more greedy loading fix