fix make_up
Merge branch 'hotfix/fix_make_up2'

* hotfix/fix_make_up2:
  fix make_up