Fix for Supplier missing