Make loader more BP-friendly