Attempt to fix loading issues