I fixed the "my_heir" issue