fix mauro's feedback