Fixed BOM crash