SRV-232 BOM parsing issue