Applying same fix for loading related collections