Fixed Bug in move_self()