fixed return type plus consistency