Attempt to fix loading issue