fixed return codes