Heat guard Tyler Herro is ramping up his workouts with Game 3 of the Finals being his targeted return to action, Chris Haynes of NBA on TNT tweets.

Herro’s season appeared to be over when he broke his hand during Game 1 of the first-round series against Milwaukee. Herro underwent hand surgery on April 21 and was expected to miss a minimum of six weeks.

Miami’s stunning run to the Finals as an eighth seed has provided Herro was an opportunity to contribute in the Finals. Game 3 is slated for Wednesday, June 7.

However, Herro indicated after Miami’s Game 7 triumph in Boston on Monday that he’s still experiencing post-surgical pain in his right hand, Ira Winderman of the South Florida Sun Sentinel tweets. Herro believes he’ll return in the Finals, though a Game 3 comeback might be a stretch.

Herro was the team’s third-leading scorer during the regular season at 20.1 points per game. He also averaged 5.4 rebounds and 4.2 assists in 34.9 minutes per game.  He’s a career 38.3% 3-point shooter and 87.5% free throw shooter.

If Herro can return to action, coach Erik Spoelstra will have the pleasant dilemma of how to work him into a rotation that has proved so successful during the postseason.