Merge "Revert "Fix return error""