Fix bug: change node hierarchy