fix: returnType never to be null