fixed return vals