Fix potential loading issues