It’s tough to shake a crush, and it looks like How I Met Your Mother’s Robin isn’t quite over hers yet.

Battlestar Galactica alum Michael Trucco will reprise his role as the guy who catches Robin’s eye in a multi-episode arc on the CBS sitcom this fall, sources tell TVLine exclusively. Trucco first appeared on the show two seasons ago, as an object of her affections known only as “Crush.”

RELATED | 6 Spoilers on How I Met Your Mother‘s New Season

Though the show wanted Trucco for more episodes in Season 6, his involvement with USA Network’s Fairly Legal (on which he plays Justin) made that impossible at the time. HIMYM definitely has him for a chunk of the upcoming Season 8, which is sure to raise questions about the fate of Fairly Legal.

RELATED | Fall TV Grid: What’s on When? And Versus What?

Last season’s HIMYM finale revealed that Barney and Robin will become man and wife in the future, but there’s lots of time for other romantic diversions in the interim. Our bet is that Trucco will be the significant romance that executive producer Craig Thomas previewed to TVLine in May. “We’re going to introduce a new love interest for Robin right away,” he said. “It’s not going to be Barney and Robin together immediately, because they’re too tangled up in other things… We’ll show you how that [new] relationship ends up leading her back to Barney.”