fixed return data and test it