fixed estimator
fix discriminator