Change some bug