#1052 amending last commit to fix ParentID issue