finish this issue

:ok_hand: