Fix fetching container