Fixed loading issues.