Support for parents and siblings hotfix