[FIX] flake and return clause