fixed return value changes