fixing some issues about the changing to node