Fix bugs feedback