Function return value format issue fix.