fix #3 added missing returns