Fix the node listener behaviour