fixed return data