Fixed lookup issue