BOM bug fixed