Cleaned up the weird parenting issue