By Dan Snierson
Updated March 04, 2015 at 12:00 PM EST
Credit: Peter "Hopper" Stone/ABC via Getty Images

Modern Family will welcome back two familiar faces in one upcoming episode: Benjamin Bratt and Andy Daly.

EW has learned that Bratt will reprise his role as Javier, Gloria’s charming ex, in an installment of the ABC comedy that will likely air in late April or early May. He winds up causing a fuss when he finds out that Gloria (Sofia Vergara) is applying to becoming a U.S. citizen.

Meanwhile, Daly returns as Principal Brown in a story line in in which Alex (Ariel Winter) may or may not realize her dream of becoming class valedictorian.

Daly, who currently headlines the Comedy Central series Review, made his most recent Family appearance last winter. Bratt, who starred on 24 last year, hasn’t been seen complicating Gloria’s life since season 4.

Season 6 has also featured such guests as Elizabeth Banks, Nathan Lane, Tyne Daly, Steve Zahn, and Kristen Johnston.