Fixed lookup bug