BUG: fix the return args