fixed return format