fix ret type check
merge