While Oliver Queen and Felicity Smoak are celebrating their engagement (and Felicity's survival of an assassination attempt) on Arrow right now, don't expect things to go too smoothly.

We pointed out on Wednesday night that while Oliver gave Felicity her engagement ring back during the episode, she wasn't wearing it in the "four months from now" flash-forward at the end. Stephen Amell, speaking alongside co-star John Barrowman at the Arrow panel at Heroes and Villains Fest in New Jersey this weekend, was blunt about the scene's meaning.

"The fact is, Felicity is not wearing her ring in that flash forward scene, and that was not a mistake," Amell said. "Spoiler alert, I probably mess it up."

That's very similar to what showrunner Wendy Mericle said when we asked her about it at the time.

Things aren't all bad for Green Arrow's leading lady, though; she's got a fan on the stage. Barrowman just said if he could be another character besides Malcolm Merlyn, it would be Felicity.