Norb:

Estate bug fix