Fixing specials in estate algorithm