Quick loading fix