Fix some bug on transfer