Fix for supplier cast