change: fixed some bug