loading issue fixes