fixing multi-parent puff issue in multiple places