restore some bug