fixed return values for non-void returns