EW has learned exclusively that Tzi Ma is slated to reprise his role as The Dragon on Once Upon a Time in season 6, though details on his return are being kept under wraps.

The magical being, who used his magic to heal muggles in a small Hong Kong clinic, first appeared in season 2, when he was seemingly taken down by the magic-hating Tamara (Sonequa Martin-Green). But he reappeared in the season 5 finale when the Evil Queen (Lana Parrilla) made her presence known by ripping out The Dragon’s heart. Considering he’ll be back in season 6, it appears he’s alive — though he may now be under the control of the Evil Queen.