Fixed up getEntity function for cb 2607+