fixed mcx304, converted to CBXEntityFinder