Fixed BOM issue