fixed return types