Final fix for loading issues