better bom handling