return fix
bug fix for merge

Signed-off-by: Key-Zhang <zmj1316@gmail.com>