More clean strategy to detect the magic calls

More clean strategy to detect the magic calls