Viktor Henkin's 1000 Checkmate Combinations

Hi Chess fans. I have a question. Is it known that the classic book Viktor Henkin’s 1000 Checkmate Combinations has an incorrect solution in the first chapter 'The Rook'? The example showing how a black passed pawn on third rank combines with the rook to deliver mate was taken from the 1952 game Stlotz vs Kotov. The position: Black — rook on g8, king on h7, queen on f4 and pawns on b7, d5, f3, h5. White — queen on a7, rook on b1, knight on f1, king on h1, bishop on h3 and pawns on a2, b3, h2. Black to move. The solution given in the book on page 25 is to right away move the black passed pawn to f2. This can be countered by White by either Ng3 or Bg2, to block the rook which controls the g-file, from delivering mate on g1. Either ways move black queen to f3 next. Then if it was the knight on g3 and the black queen is checking on f3, and white bishop blocks on g2, then move the f2 pawn to f1 and promote to a queen is the book’s solution. However, the white rook on b1 will immediately take the promoted pawn (queen). Writing down the precise moves: 1 … f2, 2 Bg2 (2 Ng3 Qf3+, 3 Bg2 f1=Q) 2 … Qf3! White resigned (3 Qxb7+ Kh8, 4 Bxf3, Rf1++). The correct solution must start with Qe4. Please confirm