fix wrong return types