fixing loading issues.