Fix the return format