Demi Moore and daughter Rumer Willis seem to be getting their relationship back on track.

Moore and Willis were seen together Saturday at Golden Bridge Yoga, according to the Huffington Post.

After Moore and ex-husband Ashton Kutcher called it quits in 2011, the mother of three reportedly was on the outs with her daughters. The problem was compounded by the 50-year-old actress' hospital visit and rehab stint in January 2012 which E! reports was brought on by exhaustion.

Willis, 24, showed up to the class with boyfriend Jayson Blair, reports the Huffington Post.

"They all did the class together, and after 90 minutes they walked out as a group," said a source, according to Us Weekly. "Demi and Rumer seemed very close, like they had been in the past. There didn't seem to be any tension or hard feelings between them."

Although it was rumored that Willis, her 21-year-old sister Scout, and 19-year-old sister Tallulah were looking into filing a restraining order against their mother, this apparently did not come to pass.

"Everything seemed very normal and friendly," said a source who spotted the mother/daughter pair at yoga. "Then they walked separately to their cars and went on their way. Rumer left with her boyfriend, and Demi left with a girlfriend."

It appears their relationship is on the mend.