fix current unit bug