Fix lookup issue