fixed return-value