This BOM fix was also done in #38