Bug Fix for node parsing