Can't we handle this with the compiler pass instead ? Somehow ?