Fixed some bugs with the estimate support