Added an empty return fixer

Maybe, what you want is the findGivenKind, no?