Fixed Node lookup behaviour