Handle rotation correctly when parenting