Fixing BOM