Credit: Video Still/ABC

It’s no secret that Rumplestiltskin's relationship with his son, Bae, has been rocky through the years, but things may finally change for them in Neverland. After Rumple thought that his son died — granted, we all did after Bae fell through that portal — he set out on a “suicide mission” to save Henry, but now that Neal is back in his life, will that change?

In a new sneak peek for the October 20 episode (Season 3, Episode 4: “Nasty Habits”), we see Rumple standing over a few fallen Lost Boys as he picks up a spear, his face covered in war paint. As someone rustles in the woods next to him, he goes to throw it — until he sees that it’s Neal!

They both look shocked until Rumple finally breaks the silence: “Bae? How is it possible?” he questions. “It’s kind of a long story,” Neal replies. “Let’s just say the debt Robin Hood owes you has been paid.”

After the shock starts to wear off, Neal explains, “I made it here. The only thing that matters now is that I help Emma save Henry" — before asking, Where is she?”

“I left her and the rest of them aboard Hook’s ship. As noble as their intentions may be, they don’t have the stomach to do what needs to be done,” he replies, which sets things off for the two of them. Neal motions to what he did to the boys — “No, they’re just sleeping for now,” Rumple reasons — and his father claims he doesn’t have the stomach either.

“I’ll do what needs to be done. But killing Lost Boys — we don’t need to do that,” Neal replies, and from there, things really escalate.

“So I take it you have a plan? Or is the whole ‘sacrifice your life’ thing just you being dramatic?” Neal asks.

“It’s the only way. Pan is too powerful. You can only beat him if you’re willing to die, which I am,” Rumple replies, but in fact, his son suggests there is another way.

What will happen next? We’ll have to wait until Sunday to find out, but based on the synopsis and various intel we’ve gathered, we’ll be learning a lot about both of them, as “Nasty Habits” explores Rumplestiltskin’s deep backstory.

Catch the episode at 8 p.m. ET on ABC and hit the comments with your thoughts about the family tree in the comments below!

Alyse Whitney is Assistant Editor at Wetpaint Entertainment. Follow her on Twitter and Google+.