I hope I have fixed the loading issues for good now